fix travis builds

diff --git a/.travis.yml b/.travis.yml
index 4704d9ceb86de6e76fee1fec87b20b15166d53cb..2a9029ab67ee270e9e26a4a68af3ade4977b6c5c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ install:
 
 script:
   - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi
-  - if [ "${USE_DOCKER}" = "false" ]; then  LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi
-  - ./gpsbabel -D 1
+  - if [ "${USE_DOCKER}" = "false" ]; then LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi
+  - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH; # partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxdeployqt
   - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file
   - if [ "${USE_DOCKER}" = "false" ]; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi

diff --git a/build_and_test b/build_and_test
index 6e654bedc80c1eec895b5e314f3d01e418293b3e..7e5b5e627c4b6fc40d48fe702d0886fe813ddf5a 100755 (executable)
--- a/build_and_test
+++ b/build_and_test
@@ -27,6 +27,7 @@ mkdir -p $GBTEMP
 make toolinfo
 make clean
 make
+./gpsbabel -D 1 || true
 make linux-gui
 make doc
 make gpsbabel.html